From: Andrew Cooper Date: Wed, 2 Oct 2019 17:44:42 +0000 (+0100) Subject: x86/vvmx: Fix the use of RDTSCP when it is intercepted at L0 X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1284 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=9257c218e56e9902b78662e5852d69329b9cc204;p=xen.git x86/vvmx: Fix the use of RDTSCP when it is intercepted at L0 Linux has started using RDTSCP as of v5.1. This has highlighted a bug in Xen, where virtual vmexit simply gives up. (XEN) d1v1 Unhandled nested vmexit: reason 51 (XEN) domain_crash called from vvmx.c:2671 (XEN) Domain 1 (vcpu#1) crashed on cpu#2: Handle RDTSCP in the virtual vmexit hander in the same was as RDTSC intercepts. Reported-by: Sarah Newman Signed-off-by: Andrew Cooper Tested-by: Chris Brannon Reviewed-by: Wei Liu Release-acked-by: Juergen Gross --- diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index fdf449bfd1..6696bd6240 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -2491,6 +2491,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; break; case EXIT_REASON_RDTSC: + case EXIT_REASON_RDTSCP: ctrl = __n2_exec_control(v); if ( ctrl & CPU_BASED_RDTSC_EXITING ) nvcpu->nv_vmexit_pending = 1; @@ -2501,6 +2502,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, * avoiding changing guest_tsc and messing up timekeeping in L1 */ msr_split(regs, hvm_get_guest_tsc(v) + get_vvmcs(v, TSC_OFFSET)); + if ( exit_reason == EXIT_REASON_RDTSCP ) + regs->rcx = v->arch.msrs->tsc_aux; update_guest_eip(); return 1;